bitkeeper revision 1.1483 (428de756rFBp-KHtm51Jw47YJiLjXA)

Manual merge.

diff --cc linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c
index f15fcab014183dfd0e565583b10e26b7b4877cdb,9c181affabb124646eb000073130a912f53ea880..8c30d50cfbfd037fd74d6d8338f649327eeb194f
--- 1/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c
--- 2/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c
@@@ -1427,13 -1365,12 +1425,13 @@@ int __init xlblk_init(void
           (xen_start_info.flags & SIF_BLK_BE_DOMAIN) )
          return 0;
  
-     printk(KERN_INFO "xen_blk: Initialising virtual block device driver\n");
+     IPRINTK("Initialising virtual block device driver\n");
  
 -    rec_ring_free = 0;
 -    for ( i = 0; i < BLKIF_RING_SIZE; i++ )
 -        rec_ring[i].id = i+1;
 -    rec_ring[BLKIF_RING_SIZE-1].id = 0x0fffffff;
 +    blk_shadow_free = 0;
 +    memset(blk_shadow, 0, sizeof(blk_shadow));
 +    for ( i = 0; i < BLK_RING_SIZE; i++ )
 +        blk_shadow[i].req.id = i+1;
 +    blk_shadow[BLK_RING_SIZE-1].req.id = 0x0fffffff;
  
      (void)ctrl_if_register_receiver(CMSG_BLKIF_FE, blkif_ctrlif_rx,
                                      CALLBACK_IN_BLOCKING_CONTEXT);

diff --cc linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h
Simple merge